public class Hello{
    public static void main(String[] args){
        System.out.println("Hello");
        int sum = 3+5;
        System.out.println(sum);
<<<<<<< HEAD
        //完成bug修复
        System.out.println("bug已经修复");
=======
        //dev01分支的bug修复
        System.out.println("修复了分支dev01上的bug");
>>>>>>> dev01
    }
}